home *** CD-ROM | disk | FTP | other *** search
- *** ns_resp.c- Fri Dec 29 16:08:17 1995
- --- ns_resp.c Fri Mar 22 14:13:56 1996
- ***************
- *** 1,6 ****
- #if !defined(lint) && !defined(SABER)
- static char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91";
- ! static char rcsid[] = "$Id: settransfer-gaine.shar,v 8.2 1996/10/25 17:07:59 vixie Exp $";
- #endif /* not lint */
-
- /*
- --- 1,6 ----
- #if !defined(lint) && !defined(SABER)
- static char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91";
- ! static char rcsid[] = "$Id: settransfer-gaine.shar,v 8.2 1996/10/25 17:07:59 vixie Exp $";
- #endif /* not lint */
-
- /*
- ***************
- *** 887,894 ****
- * sort them appropriately for the local context.
- */
- #ifdef SORT_RESPONSE
- ! if (!restart && ancount > 1 && (lp = local(&qp->q_from)) != NULL)
- ! sort_response(tp, ancount, lp, eom);
- #endif
-
- /*
- --- 887,896 ----
- * sort them appropriately for the local context.
- */
- #ifdef SORT_RESPONSE
- ! #if !defined(SETTRANSFER) || defined(ROUND_ROBIN)
- ! if (ancount > 1 && (lp = local(&qp->q_from)) != NULL)
- ! sort_response(tp, ancount, lp, eom);
- ! #endif /* !SETTRANSFER || ROUND_ROBIN */
- #endif
-
- /*
- ***************
- *** 944,953 ****
- */
- if ((!restart || !cname) && qp->q_cmsglen && ancount) {
- dprintf(1, (ddt, "Cname second pass\n"));
- ! newmsglen = qp->q_cmsglen;
- bcopy(qp->q_cmsg, newmsg, newmsglen);
- } else {
- ! newmsglen = msglen;
- bcopy(msg, newmsg, newmsglen);
- }
- hp = (HEADER *) newmsg;
- --- 946,955 ----
- */
- if ((!restart || !cname) && qp->q_cmsglen && ancount) {
- dprintf(1, (ddt, "Cname second pass\n"));
- ! newmsglen = MIN(PACKETSZ, qp->q_cmsglen);
- bcopy(qp->q_cmsg, newmsg, newmsglen);
- } else {
- ! newmsglen = MIN(PACKETSZ, msglen);
- bcopy(msg, newmsg, newmsglen);
- }
- hp = (HEADER *) newmsg;
-